diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index 5f90fdd..48cdf4d 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -93,7 +93,7 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using Core Libraries</a>
+Previous Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks - Extneding the Core</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index c03e70d..1e59684 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -114,11 +114,11 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks</a>
+Previous Topic:&nbsp;&nbsp;<a href="creating_libraries.html">Creating Your Own Libraries</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="scaffolding.html">Scaffolding</a>
+Next Topic:&nbsp;&nbsp;<a href="hooks.html">Hooks - Extending the Core</a>
 <p>
 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
 </div>
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index fa34167..99a09f8 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -209,11 +209,11 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using Libraries</a>
+Previous Topic:&nbsp;&nbsp;<a href="libraries.html">Using Code Igniter Libraries</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="ancillary_classes.html">Creating Ancillary Classes</a>
+Next Topic:&nbsp;&nbsp;<a href="core_classes.html">Creating Core System Classes</a>
 <p>
 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
 </div>
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 3016546..33d343d 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -171,11 +171,11 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>
+Previous Topic:&nbsp;&nbsp;<a href="core_classes.html">Creating Core Classes</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="scaffolding.html">Scaffolding</a>
+Next Topic:&nbsp;&nbsp;<a href="autoloader.html">Auto-loading Resources</a>
 <p>
 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
 </div>
diff --git a/user_guide/general/scripts.html b/user_guide/general/scripts.html
index d0b5d26..eb6e103 100644
--- a/user_guide/general/scripts.html
+++ b/user_guide/general/scripts.html
@@ -106,7 +106,7 @@
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="libraries.html">Loading Libraries</a>
+Next Topic:&nbsp;&nbsp;<a href="libraries.html">Using Code Igniter Libraries</a>
 <p>
 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
 </div>
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 9935c73..adfa3d0 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -99,11 +99,11 @@
 	<li><a href="./general/helpers.html">Helpers</a></li> 
 	<li><a href="./general/plugins.html">Plugins</a></li> 
 	<li><a href="./general/scripts.html">Scripts</a></li> 
-	<li><a href="./general/libraries.html">Loading Libraries</a></li> 
-	<li><a href="./general/creating_libraries.html">Creating Libraries</a></li> 
-	<li><a href="./general/ancillary_classes.html">Creating Ancillary Classes</a></li>
+	<li><a href="./general/libraries.html">Using Code Igniter Libraries</a></li> 
+	<li><a href="./general/creating_libraries.html">Creating Your Own Libraries</a></li> 
+	<li><a href="./general/core_classes.html">Creating Core Classes</a></li>
+	<li><a href="./general/hooks.html">Hooks - Extending the Core</a></li> 
 	<li><a href="./general/autoloader.html">Auto-loading Resources</a></li> 
-	<li><a href="./general/hooks.html">Hooks</a></li> 
 	<li><a href="./general/scaffolding.html">Scaffolding</a></li> 
 	<li><a href="./general/routing.html">URI Routing</a></li> 
 	<li><a href="./general/errors.html">Error Handling</a></li>